Enhanced Implementation